merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Sun, 24 Sep 2006 19:10:13 +0000 (13:10 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Sun, 24 Sep 2006 19:10:13 +0000 (13:10 -0600)

Trivial merge